* xmenu.c (set_frame_menubar): Use EMACS_UINT, not int, for indexes

that could (at least in theory) be that large.

diff --git a/src/ChangeLog b/src/ChangeLog
index d471af33f29f6bf8f0293eaf3029aabcd59e2e8f..4d56eb838c34b45305aee34b089508e2c81fb1b1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-03-22  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * xmenu.c (set_frame_menubar): Use EMACS_UINT, not int, for indexes
+       that could (at least in theory) be that large.
+
        * xdisp.c (message_log_check_duplicate): Return unsigned long, not int.
        This is less likely to overflow, and avoids undefined behavior if
        overflow does occur.  All callers changed.  Use strtoul to scan

diff --git a/src/xmenu.c b/src/xmenu.c
index eab7bb03f20c7264cc444eab1718779c790d0bae..60ac27a5b8fa477a6f1791e18b71466c10314318 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -922,7 +922,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p)
 #endif
   Lisp_Object items;
   widget_value *wv, *first_wv, *prev_wv = 0;
-  int i, last_i = 0;
+  EMACS_UINT i, last_i = 0;
   int *submenu_start, *submenu_end;
   int *submenu_top_level_items, *submenu_n_panes;